Made aliases optional, Fixes #2
Pushed aliases enabling/disabling specs
Fixed failing specs and other inconsistencies