Add initial tests and modify bspec class