Finished, but tests need some love