Passing more tests, fixed domain specific issues