added tests and cleaned up at 100% in istanbul (not constantinople)