Adding more tests and fixing more bugs with