Adding unit tests for correct attribute counts