Performance and testing

Increased performance in loading the tags
Fixed the temporarily ignored tests so they function correctly again