Changed some variable names, added tests for exceptions and modified data files for faster tests