Reactivated tests and added new test
Clean up