Removed tests for now because not working properly