Simplified directions and added tests