got all basic tests in and working