Updates due to testspec tests and first found bug! :)