fixing unit tests and getting second level to work