added more tests and fixed some others. All running now