Removed leading space & added tests