Fixed a couple of bugs
Added more specs