Fixed references
Test classes