Close #5 and remove unit tests