Updated tests and Bos