Added some specs, made specs pass