Tests

Tests added by @Ethcelon