Removing tests - not ready yet