Updated tests
Remove old test
Add unfinished tests