Cleaned up album and picture tests