Fixed name, added tests, and baby steps development