Moved Test-class to correct folder