Improved tests, added functions to deswizzle methods