Bumps version number. Re-organizes tests to save my sanity.