New tests
Revert "Getting rid of profiles"

This reverts commit 4958b7b05d402e56d36cf58d75e2d8c3fedca473.
Revert "Missed this"

This reverts commit a2f7e2c74efd07079abc62beec28069fabae06e8.