Testing with Ryan and Brandon

Added tests and cleaned up some typos...