Cleaned up specs and added #new specs