added more corrections
corrected travis (not sure if it will work)
added whole bunch of tests and required classes
finally all tests passes (apc skipped)