Cleaned up tests a bit. Now they are not that boring anymore