removed some tests that never passed and reduced complexity for testing. Also fixed some tests that did not pass dues to some logic errors