Adding 'tests' :D... TODO: Add tests