added initial pass at EngineTest and BufferedStoreTest
Added some more BufferedStore test and fixed some bug fixes