Finished more tests