Add basic unit tests
Remove magick methods