Some tests green, add new test