Add more tests, use dotenv gem