working in progress with adding more tests