Completed refactored specs for version 2.0.0