Closes #11: Removing/fixing pending specs