Everything is functional, time to work on tests