Added a few more specs and merged in changes from @tduffield