Removed functions that aren't needed and added more to the simple test