Fixed some minor bugs - Tests run