Added better errors, removed test specs