V 1.2

Added tests, put all the folders in the JUnit., fixed the errors.