added some new (failing) tests, renamed Test class, formated code