Added new test and improved on others. Im still doing work on these