Added tests, simplified methods
Added cassette for archive loader