Fixed bug in the Construct class. Added test. Removed unused code and imports.