Almost done, damn tests