Removed remaining swaps, added test directory