Working on #29 and expand constructor test.

2 jobs for develop in 3 minutes and 18 seconds (queued for 2 seconds)