Finished cse and added more tests