Moved common test source, added some more tests