Added tests
Made tests pass (cast strings to ints etc...)