Finished reviewing functions up to 167
Added more tests