Organized tests; more error checking
More tests